Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 28 Jan 2012 06:45:36 +0000 (22:45 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 28 Jan 2012 06:45:36 +0000 (22:45 -0800)
commitb7613b0b4edfa8baf1eb245e2facc4ac10b5e7b3
treebe482e7257aca9e0ddd8b8732f93dcdeb4ef7ccf
parentdeb47ca515966f563e6993d0490a0298cd1cc698
parentc8a0318c692d420be0182d465908e319aaf8117f
Merge from trunk.